From 72e9937e0049ae5db17edf3d7ad7059240711c6e Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 15 May 2014 18:11:20 -0400
Subject: [PATCH] wayland: Remove unused stuff

---
 gdk/wayland/gdkcursor-wayland.c  |  5 -----
 gdk/wayland/gdkdisplay-wayland.h |  3 +--
 gdk/wayland/gdkwindow-wayland.c  | 35 --------------------------------
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index 677f500bc2..5d92732783 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -50,7 +50,6 @@ struct _GdkWaylandCursor
 {
   GdkCursor cursor;
   gchar *name;
-  guint serial;
 
   struct
   {
@@ -69,8 +68,6 @@ struct _GdkWaylandCursorClass
 
 G_DEFINE_TYPE (GdkWaylandCursor, _gdk_wayland_cursor, GDK_TYPE_CURSOR)
 
-static guint theme_serial = 0;
-
 struct cursor_cache_key
 {
   GdkCursorType type;
@@ -319,7 +316,6 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay  *display,
                           "display", display,
                           NULL);
   private->name = g_strdup (name);
-  private->serial = theme_serial;
   private->surface.scale = 1;
 
   /* Blank cursor case */
@@ -349,7 +345,6 @@ _gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display,
 			 "display", wayland_display,
 			 NULL);
   cursor->name = NULL;
-  cursor->serial = theme_serial;
   cursor->surface.hotspot_x = x;
   cursor->surface.hotspot_y = y;
 
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index a68753c754..077248abc6 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -50,8 +50,7 @@ struct _GdkWaylandDisplay
   /* Startup notification */
   gchar *startup_notification_id;
 
-  /* Time of most recent user interaction and most recent serial */
-  gulong user_time;
+  /* Most recent serial */
   guint32 serial;
 
   /* Wayland fields below */
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index cf1f02d271..7f67e1be85 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -94,8 +94,6 @@ struct _GdkWindowImplWayland
 
   GdkWindow *wrapper;
 
-  GdkCursor *cursor;
-
   /* The wl_outputs that this window currently touches */
   GSList *outputs;
 
@@ -115,9 +113,6 @@ struct _GdkWindowImplWayland
 
   gchar *title;
 
-  /* Time of most recent user interaction. */
-  gulong user_time;
-
   GdkGeometry geometry_hints;
   GdkWindowHints geometry_mask;
 
@@ -593,9 +588,6 @@ gdk_window_impl_wayland_finalize (GObject *object)
 
   impl = GDK_WINDOW_IMPL_WAYLAND (object);
 
-  if (impl->cursor)
-    g_object_unref (impl->cursor);
-
   g_free (impl->title);
 
   g_clear_pointer (&impl->opaque_region, cairo_region_destroy);
@@ -631,12 +623,6 @@ gdk_wayland_window_configure (GdkWindow *window,
   _gdk_wayland_display_deliver_event (display, event);
 }
 
-static void
-gdk_wayland_window_set_user_time (GdkWindow *window,
-                                  guint32    user_time)
-{
-}
-
 static void
 gdk_wayland_window_sync_parent (GdkWindow *window)
 {
@@ -1081,18 +1067,8 @@ static void
 gdk_wayland_window_show (GdkWindow *window,
                          gboolean   already_mapped)
 {
-  GdkDisplay *display;
-  GdkWaylandDisplay *display_wayland;
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
 
-  display = gdk_window_get_display (window);
-  display_wayland = GDK_WAYLAND_DISPLAY (display);
-
-  if (impl->user_time != 0 &&
-      display_wayland->user_time != 0 &&
-      XSERVER_TIME_IS_LATER (display_wayland->user_time, impl->user_time))
-    gdk_wayland_window_set_user_time (window, impl->user_time);
-
   if (!impl->surface)
     gdk_wayland_window_create_surface (window);
 
@@ -1548,17 +1524,6 @@ static void
 gdk_wayland_window_set_focus_on_map (GdkWindow *window,
                                      gboolean focus_on_map)
 {
-  focus_on_map = focus_on_map != FALSE;
-
-  if (window->focus_on_map != focus_on_map)
-    {
-      window->focus_on_map = focus_on_map;
-
-      if ((!GDK_WINDOW_DESTROYED (window)) &&
-          (!window->focus_on_map) &&
-          WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
-        gdk_wayland_window_set_user_time (window, 0);
-    }
 }
 
 static void
-- 
2.30.2